From: David Engster <dengste@eml.cc>
Date: Mon, 29 Jul 2013 20:28:22 +0000 (+0200)
Subject: Merge CEDET upstream (rev. 8579)
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~3287^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=86b192c1479d167c13edb9cdaa026c231c8a0442;p=emacs.git

Merge CEDET upstream (rev. 8579)
---

86b192c1479d167c13edb9cdaa026c231c8a0442
diff --cc doc/misc/ChangeLog
index b4cd73bda08,bef3f84c846..b306ce5ba0a
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@@ -1,8 -1,11 +1,16 @@@
+ 2013-07-29  David Engster <deng@randomsample.de>
+ 
+ 	* eieio.texi (top): Make clear that EIEIO is not a full CLOS
+ 	implementation.
+ 	(Introduction): Add further missing features.
+ 	(Building Classes): Add introductory paragraph.
+ 	(Wish List): Add metaclasses and EQL specialization.
+ 
 +2013-07-29  Michael Albinus  <michael.albinus@gmx.de>
 +
 +	* tramp.texi (Frequently Asked Questions): Mention
 +	`tramp-use-ssh-controlmaster-options'.
 +
  2013-07-26  Tassilo Horn  <tsdh@gnu.org>
  
  	* gnus.texi (Sorting the Summary Buffer): Document new defcustom